Check arguments. (#317491, Paolo Borelli)

2005-09-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkbutton.c (gtk_button_set_image): Check arguments.  (#317491,
	Paolo Borelli)

diff --git a/ChangeLog b/ChangeLog
index 1032e8a85ba64c98112ecaa76cebffadac1c7fd8..8190ac9d9c944b9c5e577d69bde2c4b875d79976 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkbutton.c (gtk_button_set_image): Check arguments.  (#317491,
+       Paolo Borelli)
+
        * gtk/gtkpaned.c (gtk_paned_grab_notify): Stop drags when being
        grab shadowed.  (#317332)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1032e8a85ba64c98112ecaa76cebffadac1c7fd8..8190ac9d9c944b9c5e577d69bde2c4b875d79976 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-09-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkbutton.c (gtk_button_set_image): Check arguments.  (#317491,
+       Paolo Borelli)
+
        * gtk/gtkpaned.c (gtk_paned_grab_notify): Stop drags when being
        grab shadowed.  (#317332)
 

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 134fec6eaefce8525b9296ff4f0e8c2d542f66a9..71b53c225d5edc0f0159267c3393dc3f9132aa4c 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1845,7 +1845,12 @@ void
 gtk_button_set_image (GtkButton *button,
                      GtkWidget *image)
 {
-  GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
+  GtkButtonPrivate *priv;
+
+  g_return_if_fail (GTK_IS_BUTTON (button));
+  g_return_if_fail (image == NULL || GTK_IS_WIDGET (image));
+
+  priv = GTK_BUTTON_GET_PRIVATE (button);
 
   priv->image = image;
   priv->image_is_stock = (image == NULL);